Rollup of 10 pull requests #119578

matthiaskrgr · 2024-01-04T14:34:02Z

Successful merges:

add test for #117626 #117636 (add test for Nightly regression in Structual Eq check for match #117626)
Promote riscv32{im|imafc} targets to tier 2 #118704 (Promote riscv32{im|imafc} targets to tier 2)
Switch from using //~ERROR annotations with --error-format to error-pattern #119184 (Switch from using //~ERROR annotations with --error-format to error-pattern)
custom mir: make it clear what the return block is #119325 (custom mir: make it clear what the return block is)
Use Result::flatten in catch_with_exit_code #119391 (Use Result::flatten in catch_with_exit_code)
Support reg_addr register class in s390x inline assembly #119431 (Support reg_addr register class in s390x inline assembly)
Remove libtest's dylib #119475 (Remove libtest's dylib)
Make offset_of field parsing use metavariable which handles any spacing #119532 (Make offset_of field parsing use metavariable which handles any spacing)
stop feed vis when cant access for trait item #119553 (stop feed vis when cant access for trait item)
Miri subtree update #119574 (Miri subtree update)

r? @ghost
@rustbot modify labels: rollup

…ror-pattern` Resolves Issue rust-lang#118752

Co-authored-by: Jefffrey <[email protected]> Co-authored-by: Ralf Jung <[email protected]>

Support for tempfile crate on UNIX hosts Reviving old PR: rust-lang/miri#2720 Attempted to apply the changes as suggested by rust-lang/miri#2720 (comment) To fix tempfile to work for UNIX targets only and fall back to previous behaviour of only supporting default mode for Windows targets

NaN non-determinism for intrinsics and libm functions

Fix integer overflow ICEs from round_up_to_next_multiple_of Turns out the standard library _does_ have the function we need. So I swapped us to using the checked version in mmap/munmap where we can return an error, and we're still using the ICEy version in SIMD. I found one of the ICE cases by running this test: https://github.com/wbcchsyn/rust-mmap-allocator/blob/765bcaab6e3bfd1cb1e6eaac80ac7e821fb5979b/src/mmap_allocator.rs#L195-L210

…Jung Use `windows-sys` in windows tests This PR adds `windows-sys` to `test_dependencies` so that we don't have to write out windows api bindings for each test.

add test for rust-lang#117626 Close rust-lang#117626

Promote `riscv32{im|imafc}` targets to tier 2 Pending the approval of [the MCP](rust-lang/compiler-team#701).

…, r=davidtwco Switch from using `//~ERROR` annotations with `--error-format` to `error-pattern` Fixes rust-lang#118752 As noticed by ```@jyn514``` while working on a patch, tests failed due to `//~ERROR` annotations used in combination with the older `--error-format` which is now `error-pattern`.

…rors custom mir: make it clear what the return block is Custom MIR recently got support for specifying the "unwind action", so now there's two things coming after the actual call part of `Call` terminators. That's not very self-explaining so I propose we change the syntax to imitate keyword arguments: ``` Call(popped = Vec::pop(v), ReturnTo(drop), UnwindContinue()) ``` Also fix some outdated docs and add some docs to `Call` and `Drop`.

Use Result::flatten in catch_with_exit_code

Make offset_of field parsing use metavariable which handles any spacing As discussed at and around comments rust-lang#106655 (comment) and rust-lang#106655 (comment), the current arguments to offset_of do not accept all the whitespace combinations: `0. 1.1.1` and `0.1.1. 1` are currently treated specially in `tests/ui/offset-of/offset-of-tuple-nested.rs`. They also do not allow [forwarding individual fields as in](https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=444cdf0ec02b99e8fd5fd8d8ecb312ca) ```rust macro_rules! off { ($a:expr) => { offset_of!(m::S, 0. $a) } } ``` This PR replaces the macro arguments with `($Container:ty, $($fields:expr)+ $(,)?)` which does allow any arrangement of whitespace that I could come up with and the forwarding of fields example above. This also allows for array indexing in the future, which I think is the last future extension to the syntax suggested in the offset_of RFC. Tracking issue for offset_of: rust-lang#106655 ``@rustbot`` label F-offset_of ``@est31``

stop feed vis when cant access for trait item Fixes rust-lang#119463 It's not necessary to feed visibility when use a private trait. r? ``@petrochenkov``

Miri subtree update r? `@ghost`

matthiaskrgr · 2024-01-04T14:34:27Z

@bors r+ rollup=never p=10

bors · 2024-01-04T14:34:30Z

📌 Commit 6579378 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-01-04T19:44:17Z

⌛ Testing commit 6579378 with merge 4c5ce1f...

bors · 2024-01-04T21:43:07Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4c5ce1f to master...

rust-timer · 2024-01-04T21:45:56Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#117636	add test for #117626	`06a0ff7f083384f978e5790aee986d0bee2f7ceb` (link)
#118704	Promote `riscv32{im	imafc}` targets to tier 2
#119184	Switch from using `//~ERROR` annotations with `--error-form…	`8a7ca2d49e7af9c3927554f8136cbb0745dfdb0d` (link)
#119325	custom mir: make it clear what the return block is	`e1a4f7517cc97e980c7d958ac7b4904024e7b6b3` (link)
#119391	Use Result::flatten in catch_with_exit_code	`7ea28a3545db5f0cafea6f373e71c43d7b5901ce` (link)
#119431	Support reg_addr register class in s390x inline assembly	`ad6dd325c89ba6013c989df07c636b313b4e2186` (link)
#119475	Remove libtest's dylib	`f5b0d1d2b476c64864217a568d6a1a32a0868305` (link)
#119532	Make offset_of field parsing use metavariable which handles…	`85b5dc5535433eeb00d4731d2d073f73566f6376` (link)
#119553	stop feed vis when cant access for trait item	`08edee8044206440e222e02a949632b668d59996` (link)
#119574	Miri subtree update	`8b41addf2f6ae398784df98384adb7fd46f88d5b` (link)

previous master: 090d5eac72

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2024-01-04T23:03:38Z

Finished benchmarking commit (4c5ce1f): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	2.1%	[0.8%, 3.4%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.1%	[0.8%, 3.4%]	2

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 670.05s -> 668.115s (-0.29%)
Artifact size: 311.83 MiB -> 311.10 MiB (-0.23%)

MabezDev and others added 30 commits December 18, 2023 11:17

Promote riscv32{im|imafc} targets to tier 2

bd7263c

Switch from using //~ERROR annotations with --error-format to `er…

af44e71

…ror-pattern` Resolves Issue rust-lang#118752

have windows tests use windows-sys

ac9368a

custom mir: make it clear what the return block is

0f9baa8

custom mir: better type-checking

4bf2794

fast_math: detect non-finite results

dae48ea

Support for tempfile crate on UNIX hosts

cf2ef7d

Co-authored-by: Jefffrey <[email protected]> Co-authored-by: Ralf Jung <[email protected]>

make float intrinsics return non-deterministic NaN

86198a1

add NaN-nondet to libm functions

0f98c0e

NaN non-determinism for SIMD intrinsics

ee42d1e

don't test unspecified case

771e479

Auto merge of rust-lang#3244 - RalfJung:nan-nondet, r=RalfJung

a63fd5e

NaN non-determinism for intrinsics and libm functions

add test for rust-lang#117626

437f07b

Use Result::flatten in catch_with_exit_code

7e3f5f8

Fix integer overflow ICEs from round_up_to_next_multiple_of

4da47a4

undo some lockfile changes, add explicit types to tests

109ada8

Auto merge of rust-lang#3239 - beepster4096:windows_sys_tests, r=Ralf…

38847ae

…Jung Use `windows-sys` in windows tests This PR adds `windows-sys` to `test_dependencies` so that we don't have to write out windows api bindings for each test.

Remove libtest's dylib

c0fa85e

Make offset_of field parsing use metavariable which handles any spacing

09bb07e

Update after rebase

f0c0a49

Support reg_addr register class in s390x inline assembly

ee41651

fallback visibility for unexpected trait item

862368d

miri: do not forward RUSTFLAGS to deps build

5aa15b6

Rollup merge of rust-lang#117636 - bvanjoi:fix-117626, r=TaKO8Ki

5c47d77

add test for rust-lang#117626 Close rust-lang#117626

Rollup merge of rust-lang#118704 - esp-rs:rv32-tier-2, r=davidtwco

08c822f

Promote `riscv32{im|imafc}` targets to tier 2 Pending the approval of [the MCP](rust-lang/compiler-team#701).

Rollup merge of rust-lang#119391 - DaniPopes:catch-flatten, r=davidtwco

3d8d10d

Use Result::flatten in catch_with_exit_code

matthiaskrgr added 3 commits January 4, 2024 15:34

Rollup merge of rust-lang#119553 - bvanjoi:fix-119463, r=petrochenkov

ee882d6

stop feed vis when cant access for trait item Fixes rust-lang#119463 It's not necessary to feed visibility when use a private trait. r? ``@petrochenkov``

Rollup merge of rust-lang#119574 - RalfJung:miri, r=oli-obk

6579378

Miri subtree update r? `@ghost`

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 4, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 4, 2024

bors merged commit 4c5ce1f into rust-lang:master Jan 4, 2024

rustbot added this to the 1.77.0 milestone Jan 4, 2024

matthiaskrgr deleted the rollup-42yizmx branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests #119578

Rollup of 10 pull requests #119578

Uh oh!

matthiaskrgr commented Jan 4, 2024

Uh oh!

matthiaskrgr commented Jan 4, 2024

Uh oh!

bors commented Jan 4, 2024

Uh oh!

bors commented Jan 4, 2024

Uh oh!

bors commented Jan 4, 2024

Uh oh!

rust-timer commented Jan 4, 2024

Uh oh!

rust-timer commented Jan 4, 2024

Uh oh!

Uh oh!

Rollup of 10 pull requests #119578

Rollup of 10 pull requests #119578

Uh oh!

Conversation

matthiaskrgr commented Jan 4, 2024

Uh oh!

matthiaskrgr commented Jan 4, 2024

Uh oh!

bors commented Jan 4, 2024

Uh oh!

bors commented Jan 4, 2024

Uh oh!

bors commented Jan 4, 2024

Uh oh!

rust-timer commented Jan 4, 2024

Uh oh!

rust-timer commented Jan 4, 2024

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!